(w32font_text_extents): Zero whole metrics struct first.

(compute_metrics): Don't set failure if we just cleared the cache.

diff --git a/src/ChangeLog b/src/ChangeLog
index c67bd19a2955cb9c580b76a6df13fb72d540b64d..a25f6cb615aa1bc4d567bdce620ed13bc7a9dcf0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2008-05-26  Jason Rumney  <jasonr@gnu.org>
 
         * w32font.c (w32font_text_extents): Zero whole metrics struct first.
+        (compute_metrics): Don't set failure if we just cleared the cache.
 
 2008-05-25  Kenichi Handa  <handa@m17n.org>
 

diff --git a/src/w32font.c b/src/w32font.c
index 22d8c26d069732e326967713e83abd0651e6e8a0..64d48e2ed638806c3afbbed3bc4a9b2fbaf7e19e 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -1896,7 +1896,8 @@ static void compute_metrics (dc, w32_font, code, metrics)
          w32_font->glyph_idx = 0;
          clear_cached_metrics (w32_font);
        }
-      metrics->status = W32METRIC_FAIL;
+      else
+        metrics->status = W32METRIC_FAIL;
     }
 }